Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 17 Dec 2011 00:30:30 +0000 (16:30 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 17 Dec 2011 00:30:30 +0000 (16:30 -0800)
commitedaa8aa22d455b6721bc99ca035b677ad600f8e1
treebb2ed382a60914fa1ef0966fdc40858bcdda774f
parentc151adf30ff2a12c61b8d8afdb25c1773060ad13
parent1b9916c132b4b09e5e39d5776db01fbab92c0598
Merge from trunk.